feat: upgrade prometheus #13671

pracucci · 2024-07-26T08:04:57Z

What this PR does / why we need it:

Prometheus introduced a breaking change to storage interface, adding LabelsHint to LabelNames() and LabelValues(). This is breaking prometheus vendoring in GEM repository, where we also have an application (gateway) vendoring Loki.

In this PR I've attempted a prometheus upgrade in Loki. Details:

It's carrying a bunch of other dependencies upgraded too 😱
gRPC upgrade comes with the deprecation of grpc.Dial(). There's no trivial replacement, so I've added a nolint rule for now (we've done the same in Mimir to gain some time).
Recent changes in Prometheus regexp label matcher makes it incomparable with a deep equal. There are few tests in Loki running a deep equal on object containing regexp matchers. I've changed these tests to compare the matchers using the String() representation (same approach took in Mimir). Don't know if this is acceptable to you.

Note to reviewers:

I need help fixing clients/pkg/logentry/logql/TestParse. I "fixed" it comparing only matchers, but it lowers the confidence of the test. I only came up with complex ideas to solve it, e.g. re-implement a deep equal using a visitor pattern, or use reflection to manipulate the regexp matcher under the hood before running a deep equal.

Which issue(s) this PR fixes:
N/A

Special notes for your reviewer:

Checklist

Reviewed the CONTRIBUTING.md guide (required)
Documentation added
Tests updated
Title matches the required conventional commits format, see here
- Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

Signed-off-by: Marco Pracucci <marco@pracucci.com>

pracucci · 2024-07-26T13:55:03Z

pkg/logql/engine.go

@@ -444,11 +443,6 @@ func (q *query) JoinSampleVector(next bool, r StepResult, stepEvaluator StepEval
 		return vec, nil
 	}

-	stepCount := int(math.Ceil(float64(q.params.End().Sub(q.params.Start()).Nanoseconds()) / float64(q.params.Step().Nanoseconds())))


Note to reviewers: the linter complained this in ineffectual assignment and I think it's right.

I also do not see any usage of this variable

pracucci · 2024-07-26T13:55:49Z

clients/pkg/promtail/targets/docker/targetmanager_test.go

@@ -50,7 +50,7 @@ func Test_TargetManager(t *testing.T) {
 		case strings.HasSuffix(path, "/networks"):
 			// Serve networks
 			w.Header().Set("Content-Type", "application/json")
-			err := json.NewEncoder(w).Encode([]types.NetworkResource{})


Note to reviewers: types.NetworkResource is deprecated, but network.Inspect is expected to be the same exact type.

Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

vlad-diachenko

Looks great. Thanks @pracucci

pracucci · 2024-08-06T12:54:15Z

Looks great. Thanks @pracucci

Well, you did the hard work, so thanks @vlad-diachenko !

@grafanabot

commit c6ab6b3 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Mon Aug 12 11:09:43 2024 -0600 chore: remove initial metric aggregation experiment (#13729) commit 3c0e3e2 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 12:00:51 2024 -0400 fix(deps): update module github.com/baidubce/bce-sdk-go to v0.9.186 (#13864) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 6f79194 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 10:20:34 2024 -0400 fix(deps): update module github.com/aliyun/aliyun-oss-go-sdk to v2.2.10+incompatible (#13861) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit ad60738 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:53:11 2024 -0400 chore(deps): update grafana/loki-build-image docker tag to v0.33.6 (#13859) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 292f911 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:46:36 2024 -0400 chore(deps): update helm/chart-testing-action action to v2.6.1 (#13855) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit e0bde12 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:45:49 2024 -0400 chore(deps): update grafana/promtail docker tag to v1.6.1 (#13851) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit a9cd5e5 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:42:53 2024 -0400 chore(deps): update grafana/promtail docker tag to v2.9.10 (#13854) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 0c28cc7 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:42:21 2024 -0400 chore(deps): update dependency go to v1.22.6 (#13842) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com> commit c3a5141 Author: Paul Rogers <129207811+paul1r@users.noreply.github.com> Date: Mon Aug 12 09:29:19 2024 -0400 chore: Update loki build image to go 1.22.6 (#13857) commit 717623b Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Mon Aug 12 15:47:29 2024 +0300 chore: manual changelog backport (#13852) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit f933a3b Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 08:40:39 2024 -0400 chore(deps): update grafana/loki docker tag to v2.9.10 (#13848) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com> commit ea6395a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 08:33:10 2024 -0400 chore(deps): update golang docker tag to v1.22.6 (#13847) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 53c0c48 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 08:32:08 2024 -0400 chore(deps): update grafana/loki-build-image docker tag to v0.33.5 (#13849) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 9315b3d Author: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Date: Fri Aug 9 12:38:47 2024 +0200 chore(ci): Update yaml file `./production/helm/loki/values.yaml` (+1 other) (#13832) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> Co-authored-by: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> commit 66d7138 Author: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Date: Thu Aug 8 17:31:41 2024 +0200 chore: [main] chore(release-3.1.x): release 3.1.1 (#13817) Co-authored-by: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com> commit d5718eb Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 10:49:41 2024 -0400 fix(deps): update github.com/grafana/jsonparser digest to ea80629 (#13814) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit f253db5 Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Thu Aug 8 17:12:11 2024 +0300 fix(ci): fixed release-please manifest (#13810) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit a93f38c Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 09:48:10 2024 -0400 fix(deps): update github.com/c2h5oh/datasize digest to aa82cc1 (#13807) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com> commit e5a3994 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 09:39:56 2024 -0400 fix(deps): update github.com/docker/go-plugins-helpers digest to 45e2431 (#13808) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 67295e0 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 09:33:48 2024 -0400 fix(deps): update github.com/axiomhq/hyperloglog digest to af9851f (#13806) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit c9b0343 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 09:32:02 2024 -0400 chore(deps): update github.com/grafana/regexp digest to a468a5b (#13805) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 5bb928e Author: Paul Rogers <129207811+paul1r@users.noreply.github.com> Date: Thu Aug 8 08:52:50 2024 -0400 chore: Turn off renovate on non-main branches (#13803) commit 217f928 Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Thu Aug 8 15:31:43 2024 +0300 fix(ci): add cleanup step into job `dist` (#13801) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 00e686d Author: benclive <ben.clive@grafana.com> Date: Thu Aug 8 10:40:16 2024 +0100 chore: Add metastore client as dep for rf1 querier & ignore auth for ListBlocks (#13786) commit df61482 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed Aug 7 18:12:13 2024 -0400 fix(deps): update module golang.org/x/text to v0.17.0 (main) (#13794) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit f523530 Author: Periklis Tsirakidis <periklis@redhat.com> Date: Wed Aug 7 20:05:42 2024 +0200 fix(operator): Don't overwrite annotations for LokiStack ingress resources (#13708) commit 5ef83a7 Author: Ned Andreev <n@andreev.sh> Date: Wed Aug 7 19:44:43 2024 +0300 fix: panic when parsing and extracting JSON key values (#13790) commit bb257f5 Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Wed Aug 7 17:39:04 2024 +0300 feat(loki): add ability to disable AWS S3 dualstack endpoints usage (#13785) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 1bf9791 Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Wed Aug 7 16:10:34 2024 +0300 fix(helm): fixed memcached and provisioner templates (#13788) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 638f59f Author: benclive <ben.clive@grafana.com> Date: Wed Aug 7 14:06:28 2024 +0100 chore: Remove unused stream index from RF1 ingester (#13758) commit 7683a79 Author: Ned Andreev <n@andreev.sh> Date: Tue Aug 6 20:26:10 2024 +0300 fix: Include whitespaces in extracted tokens (#13738) Co-authored-by: Travis Patterson <travis.patterson@grafana.com> commit da63ca7 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Aug 6 12:41:48 2024 -0400 chore(deps): update module golang.org/x/net to v0.23.0 [security] (main) (#13763) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com> commit f8bf3bb Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Aug 6 12:29:47 2024 -0400 fix(deps): update module github.com/docker/docker to v27.1.1+incompatible [security] (main) (#13762) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit b88583d Author: Marco Pracucci <marco@pracucci.com> Date: Tue Aug 6 16:04:28 2024 +0200 feat: upgrade prometheus (#13671) Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> Co-authored-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 3be5a45 Author: Dylan Guedes <djmgguedes@gmail.com> Date: Mon Aug 5 17:59:21 2024 -0300 fix(break): helm: Fix how we set imagePullSecrets for enterprise-gateway and admin-api. (#13761) commit bdfc86b Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Mon Aug 5 13:46:10 2024 +0300 chore(helm-chart): added SSE config into AWS storage config (#13746) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 7e224d5 Author: Sandeep Sukhani <sandeep.d.sukhani@gmail.com> Date: Sun Aug 4 19:28:29 2024 +0530 fix: try reading chunks which have incorrect offset for blocks (#13720) commit 629671e Author: J Stickler <julie.stickler@grafana.com> Date: Fri Aug 2 16:58:41 2024 -0400 docs: Update the Visualize topic (#13742) commit 917053a Author: Cyril Tovena <cyril.tovena@gmail.com> Date: Fri Aug 2 18:07:17 2024 +0200 feat: Introduce wal segment read path. (#13695) Co-authored-by: Ben Clive <ben.clive@grafana.com> commit 7c50b43 Author: Paul Rogers <129207811+paul1r@users.noreply.github.com> Date: Fri Aug 2 08:47:33 2024 -0400 build: Update loki-build-image to Alpine 3.20.2 (#13744) commit 6dd6b65 Author: jackyin <yincong@baidu.com> Date: Fri Aug 2 01:30:11 2024 +0800 fix: ast left cycular reference result in oom (#13501) Co-authored-by: Travis Patterson <travis.patterson@grafana.com> commit e81345e Author: J Stickler <julie.stickler@grafana.com> Date: Thu Aug 1 11:29:38 2024 -0400 docs: fix broken links due to Alloy docs reorg (#13715) commit 40e8352 Author: Jack Baldry <jack.baldry@grafana.com> Date: Thu Aug 1 15:41:48 2024 +0100 docs: rewrite quickstart with Killercoda metadata (#13234) Signed-off-by: Jack Baldry <jack.baldry@grafana.com> Co-authored-by: J Stickler <julie.stickler@grafana.com> Co-authored-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com>

@grafanabot

commit b9e647f Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Mon Aug 12 11:31:31 2024 -0600 Squashed commit of the following: commit c6ab6b3 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Mon Aug 12 11:09:43 2024 -0600 chore: remove initial metric aggregation experiment (#13729) commit 3c0e3e2 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 12:00:51 2024 -0400 fix(deps): update module github.com/baidubce/bce-sdk-go to v0.9.186 (#13864) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 6f79194 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 10:20:34 2024 -0400 fix(deps): update module github.com/aliyun/aliyun-oss-go-sdk to v2.2.10+incompatible (#13861) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit ad60738 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:53:11 2024 -0400 chore(deps): update grafana/loki-build-image docker tag to v0.33.6 (#13859) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 292f911 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:46:36 2024 -0400 chore(deps): update helm/chart-testing-action action to v2.6.1 (#13855) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit e0bde12 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:45:49 2024 -0400 chore(deps): update grafana/promtail docker tag to v1.6.1 (#13851) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit a9cd5e5 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:42:53 2024 -0400 chore(deps): update grafana/promtail docker tag to v2.9.10 (#13854) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 0c28cc7 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 09:42:21 2024 -0400 chore(deps): update dependency go to v1.22.6 (#13842) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com> commit c3a5141 Author: Paul Rogers <129207811+paul1r@users.noreply.github.com> Date: Mon Aug 12 09:29:19 2024 -0400 chore: Update loki build image to go 1.22.6 (#13857) commit 717623b Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Mon Aug 12 15:47:29 2024 +0300 chore: manual changelog backport (#13852) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit f933a3b Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 08:40:39 2024 -0400 chore(deps): update grafana/loki docker tag to v2.9.10 (#13848) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com> commit ea6395a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 08:33:10 2024 -0400 chore(deps): update golang docker tag to v1.22.6 (#13847) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 53c0c48 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Aug 12 08:32:08 2024 -0400 chore(deps): update grafana/loki-build-image docker tag to v0.33.5 (#13849) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 9315b3d Author: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Date: Fri Aug 9 12:38:47 2024 +0200 chore(ci): Update yaml file `./production/helm/loki/values.yaml` (+1 other) (#13832) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> Co-authored-by: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> commit 66d7138 Author: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Date: Thu Aug 8 17:31:41 2024 +0200 chore: [main] chore(release-3.1.x): release 3.1.1 (#13817) Co-authored-by: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com> commit d5718eb Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 10:49:41 2024 -0400 fix(deps): update github.com/grafana/jsonparser digest to ea80629 (#13814) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit f253db5 Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Thu Aug 8 17:12:11 2024 +0300 fix(ci): fixed release-please manifest (#13810) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit a93f38c Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 09:48:10 2024 -0400 fix(deps): update github.com/c2h5oh/datasize digest to aa82cc1 (#13807) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com> commit e5a3994 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 09:39:56 2024 -0400 fix(deps): update github.com/docker/go-plugins-helpers digest to 45e2431 (#13808) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 67295e0 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 09:33:48 2024 -0400 fix(deps): update github.com/axiomhq/hyperloglog digest to af9851f (#13806) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit c9b0343 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Aug 8 09:32:02 2024 -0400 chore(deps): update github.com/grafana/regexp digest to a468a5b (#13805) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 5bb928e Author: Paul Rogers <129207811+paul1r@users.noreply.github.com> Date: Thu Aug 8 08:52:50 2024 -0400 chore: Turn off renovate on non-main branches (#13803) commit 217f928 Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Thu Aug 8 15:31:43 2024 +0300 fix(ci): add cleanup step into job `dist` (#13801) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 00e686d Author: benclive <ben.clive@grafana.com> Date: Thu Aug 8 10:40:16 2024 +0100 chore: Add metastore client as dep for rf1 querier & ignore auth for ListBlocks (#13786) commit df61482 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed Aug 7 18:12:13 2024 -0400 fix(deps): update module golang.org/x/text to v0.17.0 (main) (#13794) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit f523530 Author: Periklis Tsirakidis <periklis@redhat.com> Date: Wed Aug 7 20:05:42 2024 +0200 fix(operator): Don't overwrite annotations for LokiStack ingress resources (#13708) commit 5ef83a7 Author: Ned Andreev <n@andreev.sh> Date: Wed Aug 7 19:44:43 2024 +0300 fix: panic when parsing and extracting JSON key values (#13790) commit bb257f5 Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Wed Aug 7 17:39:04 2024 +0300 feat(loki): add ability to disable AWS S3 dualstack endpoints usage (#13785) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 1bf9791 Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Wed Aug 7 16:10:34 2024 +0300 fix(helm): fixed memcached and provisioner templates (#13788) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 638f59f Author: benclive <ben.clive@grafana.com> Date: Wed Aug 7 14:06:28 2024 +0100 chore: Remove unused stream index from RF1 ingester (#13758) commit 7683a79 Author: Ned Andreev <n@andreev.sh> Date: Tue Aug 6 20:26:10 2024 +0300 fix: Include whitespaces in extracted tokens (#13738) Co-authored-by: Travis Patterson <travis.patterson@grafana.com> commit da63ca7 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Aug 6 12:41:48 2024 -0400 chore(deps): update module golang.org/x/net to v0.23.0 [security] (main) (#13763) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com> commit f8bf3bb Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Aug 6 12:29:47 2024 -0400 fix(deps): update module github.com/docker/docker to v27.1.1+incompatible [security] (main) (#13762) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit b88583d Author: Marco Pracucci <marco@pracucci.com> Date: Tue Aug 6 16:04:28 2024 +0200 feat: upgrade prometheus (#13671) Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> Co-authored-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 3be5a45 Author: Dylan Guedes <djmgguedes@gmail.com> Date: Mon Aug 5 17:59:21 2024 -0300 fix(break): helm: Fix how we set imagePullSecrets for enterprise-gateway and admin-api. (#13761) commit bdfc86b Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com> Date: Mon Aug 5 13:46:10 2024 +0300 chore(helm-chart): added SSE config into AWS storage config (#13746) Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com> commit 7e224d5 Author: Sandeep Sukhani <sandeep.d.sukhani@gmail.com> Date: Sun Aug 4 19:28:29 2024 +0530 fix: try reading chunks which have incorrect offset for blocks (#13720) commit 629671e Author: J Stickler <julie.stickler@grafana.com> Date: Fri Aug 2 16:58:41 2024 -0400 docs: Update the Visualize topic (#13742) commit 917053a Author: Cyril Tovena <cyril.tovena@gmail.com> Date: Fri Aug 2 18:07:17 2024 +0200 feat: Introduce wal segment read path. (#13695) Co-authored-by: Ben Clive <ben.clive@grafana.com> commit 7c50b43 Author: Paul Rogers <129207811+paul1r@users.noreply.github.com> Date: Fri Aug 2 08:47:33 2024 -0400 build: Update loki-build-image to Alpine 3.20.2 (#13744) commit 6dd6b65 Author: jackyin <yincong@baidu.com> Date: Fri Aug 2 01:30:11 2024 +0800 fix: ast left cycular reference result in oom (#13501) Co-authored-by: Travis Patterson <travis.patterson@grafana.com> commit e81345e Author: J Stickler <julie.stickler@grafana.com> Date: Thu Aug 1 11:29:38 2024 -0400 docs: fix broken links due to Alloy docs reorg (#13715) commit 40e8352 Author: Jack Baldry <jack.baldry@grafana.com> Date: Thu Aug 1 15:41:48 2024 +0100 docs: rewrite quickstart with Killercoda metadata (#13234) Signed-off-by: Jack Baldry <jack.baldry@grafana.com> Co-authored-by: J Stickler <julie.stickler@grafana.com> Co-authored-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com> commit c65ba1f Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Mon Aug 12 11:08:37 2024 -0600 chore: rework pattern ingester queue metrics commit b28572a Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Fri Aug 2 13:16:01 2024 -0600 fix: change metrics around metric appends commit e430a96 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Fri Aug 2 08:59:05 2024 -0600 fix: lint and format commit 2f5485d Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Fri Aug 2 08:45:57 2024 -0600 feat: improve async tee request processing commit 3dcc50d Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Thu Aug 1 15:16:13 2024 -0600 test: add push and downsample test commit 019df76 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Thu Aug 1 14:41:41 2024 -0600 fix: formatting commit 7d98cb0 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Thu Aug 1 13:35:55 2024 -0600 chore: move some functions around commit 06269b0 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Thu Aug 1 13:29:57 2024 -0600 test: mock out ring in tests commit 07d57c3 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Thu Aug 1 11:56:34 2024 -0600 fix: formatting commit 93e4add Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Thu Aug 1 11:53:42 2024 -0600 fix: remove now unused test commit c03db1f Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Thu Aug 1 11:49:59 2024 -0600 fix: remove duplicate service detection for distributor commit fe447f5 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Thu Aug 1 11:45:31 2024 -0600 fix: service name detection on push commit afb8513 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Wed Jul 31 21:40:39 2024 -0600 feat: introduce RingClient abstraction * lint and format commit ce87fd8 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Wed Jul 31 20:41:38 2024 -0600 feat: aggregate byte and count metrics * aggregate in the pattern ingester and push back into Loki as a stream commit b49e52b Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Wed Jul 31 14:36:59 2024 -0600 chore: fix formatting commit af22a21 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Wed Jul 31 14:32:05 2024 -0600 chore: fix linting commit d51cecc Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Wed Jul 31 14:12:31 2024 -0600 chore: remove the metric aggregation experiment * this will make way for a new, simpler approach commit dad6fb5 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Wed Jul 31 13:39:07 2024 -0600 Revert "feat: collect and serve pre-aggregated bytes and counts (#13020)" This reverts commit 467eb1b. commit a6835e1 Author: Trevor Whitney <trevorjwhitney@gmail.com> Date: Wed Jul 31 13:18:12 2024 -0600 Revert "feat: downsample aggregated metrics (#13449)" This reverts commit 2c053ee.

Upgrade prometheus

034b7a7

Signed-off-by: Marco Pracucci <marco@pracucci.com>

pracucci changed the title ~~Upgrade prometheus~~ feat: upgrade prometheus Jul 26, 2024

pracucci added 15 commits July 26, 2024 10:09

Fix compilation

15067f4

Signed-off-by: Marco Pracucci <marco@pracucci.com>

fix

f42274c

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Fixed more compilation issues

c3e9c6b

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Fix Test_match

80406a6

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Fix TestParse

0e8a115

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Fixed Test_LoadRetentionRules

3b5699c

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Fixed Test_store_decodeReq_Matchers

5f03d98

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Add nolint rule for grpc.Dial()

dff595c

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Vendor prometheus from a branch to fix the panic

e978d24

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Fixed more tests doing matchers comparison

1d86aec

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Re-vendor prometheus from main

fc2adf7

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Added more nolint rules

641aff2

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Fix TestParse but lower confidence

c3e6144

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Fixed deprecation

dde2410

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Remove dead code

cb9089f

Signed-off-by: Marco Pracucci <marco@pracucci.com>

pracucci commented Jul 26, 2024

View reviewed changes

vlad-diachenko self-assigned this Aug 2, 2024

vlad-diachenko force-pushed the fix-last-prometheus-vendoring branch 2 times, most recently from 0eecc09 to 08c6cc0 Compare August 6, 2024 11:50

fixed test by asserting the matchers without FastRegexMatcher

6b239f7

Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

vlad-diachenko force-pushed the fix-last-prometheus-vendoring branch from 08c6cc0 to 6b239f7 Compare August 6, 2024 11:54

vlad-diachenko approved these changes Aug 6, 2024

View reviewed changes

pracucci marked this pull request as ready for review August 6, 2024 12:54

pracucci requested a review from a team as a code owner August 6, 2024 12:54

Merge branch 'refs/heads/main' into fix-last-prometheus-vendoring

88f73d0

vlad-diachenko merged commit b88583d into main Aug 6, 2024
62 checks passed

vlad-diachenko deleted the fix-last-prometheus-vendoring branch August 6, 2024 14:04

This was referenced Aug 15, 2024

chore(k215): release 3.2.0 #13905

Open

chore(k216): release 3.2.0 #13929

Open

loki-gh-app bot mentioned this pull request Sep 9, 2024

chore(k218): release 3.2.0 #14088

Merged

loki-gh-app bot mentioned this pull request Sep 23, 2024

chore(k221): release 3.2.0 #14214

Open

loki-gh-app bot mentioned this pull request Sep 30, 2024

chore(k222): release 3.2.0 #14305

Open

loki-gh-app bot mentioned this pull request Oct 7, 2024

chore(k223): release 3.2.0 #14402

Open

This was referenced Oct 14, 2024

chore(k224): release 3.2.0 #14486

Open

chore(k225): release 3.2.0 #14543

Closed

This was referenced Oct 21, 2024

chore(k225): release 3.2.0 #14548

Open

chore(k226): release 3.2.0 #14625

Open

loki-gh-app bot mentioned this pull request Nov 4, 2024

chore(k227): release 3.2.0 #14750

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: upgrade prometheus #13671

feat: upgrade prometheus #13671

pracucci commented Jul 26, 2024 •

edited

Loading

pracucci Jul 26, 2024

vlad-diachenko Aug 5, 2024

pracucci Jul 26, 2024

vlad-diachenko left a comment

pracucci commented Aug 6, 2024

feat: upgrade prometheus #13671

feat: upgrade prometheus #13671

Conversation

pracucci commented Jul 26, 2024 • edited Loading

pracucci Jul 26, 2024

Choose a reason for hiding this comment

vlad-diachenko Aug 5, 2024

Choose a reason for hiding this comment

pracucci Jul 26, 2024

Choose a reason for hiding this comment

vlad-diachenko left a comment

Choose a reason for hiding this comment

pracucci commented Aug 6, 2024

pracucci commented Jul 26, 2024 •

edited

Loading